From f490f165f4f535d2a387cf1eb28c2d26b9426ad2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 18 Sep 2017 11:03:42 +0200 Subject: [PATCH] use iterator combinators rather than for loops --- src/cargo/ops/cargo_compile.rs | 10 +++++----- src/cargo/ops/cargo_doc.rs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 88309fdfa..a8e9ce704 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -236,12 +236,12 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>, and the workspace has no members.", ws.current_manifest().display()).into()); }; - let mut to_builds = Vec::new(); - for p in specs.iter() { - let p = packages.get(p.query(resolve_with_overrides.iter())?)?; + let to_builds = specs.iter().map(|p| { + let pkgid = p.query(resolve_with_overrides.iter())?; + let p = packages.get(pkgid)?; p.manifest().print_teapot(ws.config()); - to_builds.push(p); - } + Ok(p) + }).collect::>>()?; let mut general_targets = Vec::new(); let mut package_targets = Vec::new(); diff --git a/src/cargo/ops/cargo_doc.rs b/src/cargo/ops/cargo_doc.rs index 0181a0c44..2d79cf063 100644 --- a/src/cargo/ops/cargo_doc.rs +++ b/src/cargo/ops/cargo_doc.rs @@ -27,10 +27,10 @@ pub fn doc(ws: &Workspace, options: &DocOptions) -> CargoResult<()> { and the workspace has no members.", ws.current_manifest().display()).into()); }; - let mut pkgs = Vec::new(); - for p in specs.iter() { - pkgs.push(packages.get(p.query(resolve_with_overrides.iter())?)?); - } + let pkgs = specs.iter().map(|p| { + let pkgid = p.query(resolve_with_overrides.iter())?; + packages.get(pkgid) + }).collect::>>()?; let mut lib_names = HashSet::new(); let mut bin_names = HashSet::new(); -- 2.30.2